Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 08:56:46 +0000 (00:56 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 08:56:46 +0000 (00:56 -0800)

Trivial merge